skip the animation if the gtk-enable-animations setting is FALSE (bug

2006-01-12  Michael Natterer  <mitch@imendio.com>

	* gtk/gtkexpander.c (gtk_expander_set_expanded): skip the
	animation if the gtk-enable-animations setting is FALSE
	(bug #142582).

diff --git a/ChangeLog b/ChangeLog
index d146b82306a3b9111670f82022b8e4513a955916..5cae63ecb33fcbfad23e53c4f6b8f092c9a8e290 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-12  Michael Natterer  <mitch@imendio.com>
+
+       * gtk/gtkexpander.c (gtk_expander_set_expanded): skip the
+       animation if the gtk-enable-animations setting is FALSE
+       (bug #142582).
+
 2006-01-11  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtklabel.c: Fix a C99ism (#326658, Kazuki Iwamoto)

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d146b82306a3b9111670f82022b8e4513a955916..5cae63ecb33fcbfad23e53c4f6b8f092c9a8e290 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2006-01-12  Michael Natterer  <mitch@imendio.com>
+
+       * gtk/gtkexpander.c (gtk_expander_set_expanded): skip the
+       animation if the gtk-enable-animations setting is FALSE
+       (bug #142582).
+
 2006-01-11  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtklabel.c: Fix a C99ism (#326658, Kazuki Iwamoto)

diff --git a/gtk/gtkexpander.c b/gtk/gtkexpander.c
index 7335b0b1a97bd2589415062b670205a833f2832a..bf537ca7c76952cd9e01951607ed0e73599236ab 100644 (file)
--- a/gtk/gtkexpander.c
+++ b/gtk/gtkexpander.c
@@ -1307,13 +1307,18 @@ gtk_expander_set_expanded (GtkExpander *expander,
 
   if (priv->expanded != expanded)
     {
+      GtkSettings *settings = gtk_widget_get_settings (GTK_WIDGET (expander));
+      gboolean     enable_animations;
+
       priv->expanded = expanded;
 
-      if (GTK_WIDGET_REALIZED (expander))
+      g_object_get (settings, "gtk-enable-animations", &enable_animations, NULL);
+
+      if (enable_animations && GTK_WIDGET_REALIZED (expander))
        {
          gtk_expander_start_animation (expander);
        }
-      else 
+      else
        {
          priv->expander_style = expanded ? GTK_EXPANDER_EXPANDED :
                                            GTK_EXPANDER_COLLAPSED;